KeyboardStatus: add "Show layout" item

Add a menu item that opens a dialog showing the current keyboard
layout. Uses the new utility in libgnomekbd.

https://bugzilla.gnome.org/show_bug.cgi?id=641415

diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 111c3c0156f6fb033a31acc97b699bc94214c7e2..883c534b8623ad22699f7f1af9ba300314d09f8b 100644 (file)
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -11,6 +11,7 @@ const St = imports.gi.St;
 
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
+const Util = imports.misc.util;
 
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
@@ -69,8 +70,11 @@ XKBIndicator.prototype = {
         this._sync_config();
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.menu.addAction(_("Show Keyboard Layout..."), Lang.bind(this, function() {
+            Util.spawn(['gkbd-keyboard-display', '-g', this._config.get_current_group() + 1]);
+        }));
         this.menu.addAction(_("Localization Settings"), function() {
-            GLib.spawn_command_line_async('gnome-control-center region');
+            Util.spawn(['gnome-control-center', 'region']);
         });
     },